bitkeeper revision 1.342 (3f1153a1RLTmwr7Jo9U1gUChA4e0Jw)

cleanup

diff --git a/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c b/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c
index 3e060ed5df87151fe0b8c5275b4a00062c942999..d537956105244946f31895cd12e11cdf6ed000b2 100644 (file)
--- a/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c
+++ b/xenolinux-2.4.21-sparse/arch/xeno/mm/ioremap.c
@@ -175,6 +175,11 @@ void iounmap(void *addr)
     vfree((void *)((unsigned long)addr & PAGE_MASK));
 }
 
+/* implementation of boot time ioremap for purpose of provising access
+to the vga console for privileged domains. Unlike boot time ioremap on 
+other architectures, ours is permanent and not reclaimed when then vmalloc
+infrastructure is started */
+
 void __init *bt_ioremap(unsigned long machine_addr, unsigned long size)
 {
         unsigned long offset, last_addr;
@@ -206,25 +211,17 @@ void __init *bt_ioremap(unsigned long machine_addr, unsigned long size)
         idx = FIX_BTMAP_BEGIN;
         while (nrpages > 0) {
                 set_fixmap(idx, machine_addr);
-
-               //unsigned long address = __fix_to_virt(idx);
-               
-
-
-//direct_set_pte(address, direct_mk_pte_phys(machine_addr, PAGE_KERNEL_NOCACHE));
-
                 machine_addr += PAGE_SIZE;
                 --idx;
                 --nrpages;
         }
 
-flush_tlb_all();
+       flush_tlb_all();
 
         return (void*) (offset + fix_to_virt(FIX_BTMAP_BEGIN));
 }
 
 
 #if 0 /* We don't support these functions. They shouldn't be required. */
-void __init *bt_ioremap(unsigned long machine_addr, unsigned long size) {}
 void __init bt_iounmap(void *addr, unsigned long size) {}
 #endif

diff --git a/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h b/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h
index d6826ee365f745c05295fcd9c92ff780c93a6a37..3dea10fdc62ffd597e172eb95ab576bd0c27f8c1 100644 (file)
--- a/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h
+++ b/xenolinux-2.4.21-sparse/include/asm-xeno/fixmap.h
@@ -50,7 +50,7 @@ enum fixed_addresses {
 #define NR_FIX_BTMAPS   8  /* 32KB For the Dom0 VGA Console */
         FIX_BTMAP_END,
         FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS - 1,
-
+       /* our bt_ioremap is permenant unlike other architectures */
        __end_of_permanent_fixed_addresses,
        __end_of_fixed_addresses = __end_of_permanent_fixed_addresses
 };